merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 26 Mar 2012 05:41:04 +0000 (14:41 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 26 Mar 2012 05:41:04 +0000 (14:41 +0900)
commit8c1b2fcff0ca3667edcc25deb56362cc5234d771
tree840ace36d6a66583ec7f68a60fb60c82d9df5c06
parentf6567ff6e268b40c73fea637d6aff75e5bb91952
parent21608b5842cb72146ec3e224a6b7bbfb5ea4f248
merge trunk